From efc4765201d2750723f2b6b9fc7973890a1c2cda Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 26 Oct 2017 11:59:43 +0200 Subject: [PATCH] SCSI: Avoid ABI change in 4.13.6 Hide the new bitfield from genksyms, as it's using what used to be a padding bit. Gbp-Pq: Topic debian Gbp-Pq: Name scsi-avoid-abi-change-in-4.13.6.patch --- include/scsi/scsi_device.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h index 6ff1bab2367..47b51b404f3 100644 --- a/include/scsi/scsi_device.h +++ b/include/scsi/scsi_device.h @@ -182,7 +182,10 @@ struct scsi_device { unsigned no_dif:1; /* T10 PI (DIF) should be disabled */ unsigned broken_fua:1; /* Don't set FUA bit */ unsigned lun_in_cdb:1; /* Store LUN bits in CDB[1] */ +#ifndef __GENKSYMS__ unsigned unmap_limit_for_ws:1; /* Use the UNMAP limit for WRITE SAME */ + /* 19 unused bits */ +#endif atomic_t disk_events_disable_depth; /* disable depth for disk events */ -- 2.30.2